351af0d4afd36c2a3f39acdc2b0cb6f3c1f969e9,codeInsight/impl/com/intellij/codeInsight/completion/XmlCompletionData.java,EntityRefGetter,get,#PsiElement#CompletionContext#,379

Before Change


        final List<String> results = new ArrayList<String>();

        if (descriptor != null) {
          final XmlNSDescriptor nsDescriptor = descriptor.getNSDescriptor();
          final XmlFile descriptorFile = nsDescriptor != null ? nsDescriptor.getDescriptorFile():null;

          if (descriptorFile != null) {

After Change


        final XmlElementDescriptor descriptor = parentOfType.getDescriptor();
        final List<String> results = new ArrayList<String>();

        final XmlNSDescriptor nsDescriptor = descriptor != null ? descriptor.getNSDescriptor():null;
        final XmlFile containingFile = (XmlFile)parentOfType.getContainingFile();
        XmlFile descriptorFile = nsDescriptor != null ?
                                       nsDescriptor.getDescriptorFile():
                                       containingFile.getDocument().getProlog().getDoctype() != null ? containingFile:null;
        if (nsDescriptor != null && descriptorFile.getName().equals(containingFile.getName() + ".dtd")) {
          descriptorFile = containingFile;
        }